Skip to contentSkip to conversation

git-diff-cache: handle pathspec beginning with a dash

PATCH Applied Jonas Fonseca 3 participants 6 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git-diff-cache: handle pathspec beginning with a dash

Parse everything after '--' as tree name or pathspec.

---

 diff-cache.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
diff-cache.c +6 -1
@@ -167,13 +167,14 @@ int main(int argc, const char **argv)
 	void *tree;
 	unsigned long size;
 	int ret;
+	int allow_options = 1;
 	int i;
 
 	read_cache();
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
-		if (*arg != '-') {
+		if (!allow_options || *arg != '-') {
 			if (tree_name) {
 				pathspec = argv + i;
 				break;
@@ -182,6 +183,10 @@ int main(int argc, const char **argv)
 			continue;
 		}
 			
+		if (!strcmp(arg, "--")) {
+			allow_options = 0;
+			continue;
+		}
 		if (!strcmp(arg, "-r")) {
 			/* We accept the -r flag just to look like git-diff-tree */
 			continue;
Signature · 1 line
Jonas Fonseca
#1 lore raw

PATCH 1/1 cg-commit: prefix pathspec argument with --

Make cg-commit handle files beginning with dashes.

---

[ Obviously depends on the patch I sent previously. ]

 cg-commit |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
cg-commit +1 -1
@@ -110,7 +110,7 @@ if [ "$1" ]; then
 	[ "$ignorecache" ] && die "-C and listing files to commit does not make sense"
 	[ -s $_git/merging ] && die "cannot commit individual files when merging"
 
-	eval commitfiles=($(git-diff-cache -r -m HEAD "$@" | \
+	eval commitfiles=($(git-diff-cache -r -m HEAD -- "$@" | \
 		sed 's/^\([^	]*\)\(.	.*\)\(	.*\)*$/"\2"/'))
 	customfiles=1
 
Signature · 1 line
Jonas Fonseca
Applied
#2 lore raw
In reply to Jonas Fonseca

Dear diary, on Mon, Jun 06, 2005 at 11:27:00PM CEST, I got a letter where Jonas Fonseca <[email protected]> told me that...

Quoted 3 lines

Parse everything after '--' as tree name or pathspec.

Thanks, applied to git-pb. Linus, any particular reason for holding this off?

Signature · 3 lines
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
#3 lore raw
Quoted 9 lines · Petr Baudis

Dear diary, on Mon, Jun 06, 2005 at 11:27:00PM CEST, I got a letter where Jonas Fonseca <[email protected]> told me that...

Quoted 3 lines

Parse everything after '--' as tree name or pathspec.

Thanks, applied to git-pb. Linus, any particular reason for holding this off?

It seems to have gone only to the mailing list. I only glance through the lists, and assume that if somebody wants me to apply a patch, they'll cc me personally too..

Linus

#4 lore raw

Dear diary, on Wed, Jun 08, 2005 at 10:00:48PM CEST, I got a letter where Linus Torvalds <[email protected]> told me that...

Quoted 8 lines · Petr Baudis
Quoted 5 lines

Dear diary, on Mon, Jun 06, 2005 at 11:27:00PM CEST, I got a letter where Jonas Fonseca <[email protected]> told me that...

Quoted 2 lines

Parse everything after '--' as tree name or pathspec.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Thanks, applied to git-pb. Linus, any particular reason for holding this off?

It seems to have gone only to the mailing list. I only glance through the lists, and assume that if somebody wants me to apply a patch, they'll cc me personally too..

I see. Jonas mentioned on IRC that he forgot to Cc' you. I'm usually going through everything on the mailing list, so if some patch stays out for few days I'll start nagging. ;-)

Signature · 3 lines
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
#5 lore raw
Quoted 4 lines · Petr Baudis

I see. Jonas mentioned on IRC that he forgot to Cc' you. I'm usually going through everything on the mailing list, so if some patch stays out for few days I'll start nagging. ;-)

Even better, just forward it to me with the original author as "From:" at the top of the email, and an added sign-off by you, and it will show which path it took.

I took the two patches you pointed out from the mailing list, so they're in my archives now.

Linus