Re: git-name-rev off-by-one bug
- From
Junio C Hamano <junkio@cox.net>
- Date
- Nov 30, 2005, 05:51 UTC
- Message-ID
- <7vslte1y5z.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <Pine.LNX.4.64.0511292031280.3099@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> Whaddaya think? I really like it.
Yes. Maybe split this into 3 pieces. I do not want to waste your time with that, so will take the liberty to do so myself, with appropriate commit log messages, if you do not mind.
1. give diff-files -[012] flags. 2. merge-one-file leaves unmerged index entries. 3. always use -M -p in git-diff.
I do not have any issue against #1.
Regarding #2, in an earlier message you said something about "patch to do that was just broken" which I did not understand; I think your patch I am replying to is doing the right thing. That case arm is dealing with a path that exists in "our" branch and the working tree blob should be the same as recorded in the HEAD, so I did not have to do the unpack-cat-chmod like I did in mine. Am I simply confused?
About #3, I am not quite sure. I often use --name-status and I do _not_ want -p to kick in when I do so. How about something like this?
---
diff --git a/git-diff.sh b/git-diff.sh index b3ec84b..8e0fe34 100755 --- a/git-diff.sh +++ b/git-diff.sh @@ -7,8 +7,6 @@ rev=$(git-rev-parse --revs-only --no-fla flags=$(git-rev-parse --no-revs --flags --sq "$@") files=$(git-rev-parse --no-revs --no-flags --sq "$@") -: ${flags:="'-M' '-p'"} - # I often say 'git diff --cached -p' and get scolded by git-diff-files, but # obviously I mean 'git diff --cached -p HEAD' in that case. case "$rev" in @@ -20,6 +18,21 @@ case "$rev" in esac esac +# If we do not have --name-status, --name-only nor -r, default to -p. +# If we do not have -B nor -C, default to -M. +case " $flags " in +*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* ) + ;; +*) + flags="$flags '-p'" ;; +esac +case " $flags " in +*" '-"[BCM]* | *" '--find-copies-harder' "*) + ;; # something like -M50. +*) + flags="$flags '-M'" ;; +esac + case "$rev" in ?*' '?*' '?*) echo >&2 "I don't understand"