Merge branch 'maint'
* maint: Update draft release notes to 1.6.1.1 Make t3411 executable fix handling of multiple untracked files for git mv -k add test cases for "git mv -k"
This commit is contained in:
commit
b32acd21d8
@ -4,6 +4,11 @@ GIT v1.6.1.1 Release Notes
|
||||
Fixes since v1.6.1
|
||||
------------------
|
||||
|
||||
* "git apply" took file modes from the patch text and updated the mode
|
||||
bits of the target tree even when the patch was not about mode changes.
|
||||
|
||||
* "git checkout $tree" did not trigger an error.
|
||||
|
||||
* "git describe --all" complained when a commit is described with a tag,
|
||||
which was nonsense.
|
||||
|
||||
@ -13,11 +18,27 @@ Fixes since v1.6.1
|
||||
* "git daemon", and "git merge-file" are more careful when freopen fails
|
||||
and barf, instead of going on and writing to unopened filehandle.
|
||||
|
||||
Other documentation fixes.
|
||||
* "git http-push" did not like some RFC 4918 compliant DAV server
|
||||
responses.
|
||||
|
||||
* "git merge -s recursive" mistakenly overwritten an untracked file in the
|
||||
work tree upon delete/modify conflict.
|
||||
|
||||
* "git merge -s recursive" didn't leave the index unmerged for entries with
|
||||
rename/delete conflictd.
|
||||
|
||||
* "git merge -s recursive" clobbered untracked files in the work tree.
|
||||
|
||||
* "git mv -k" with more than one errorneous paths misbehaved.
|
||||
|
||||
* "git rebase -i" issued an unnecessary error message upon a user error of
|
||||
marking the first commit to be "squash"ed.
|
||||
|
||||
Other documentation updates.
|
||||
|
||||
---
|
||||
exec >/var/tmp/1
|
||||
O=v1.6.1-15-ga9e67c8
|
||||
O=v1.6.1-47-g914186a
|
||||
echo O=$(git describe maint)
|
||||
git shortlog --no-merges $O..maint
|
||||
|
||||
|
@ -192,6 +192,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
memmove(destination + i,
|
||||
destination + i + 1,
|
||||
(argc - i) * sizeof(char *));
|
||||
i--;
|
||||
}
|
||||
} else
|
||||
die ("%s, source=%s, destination=%s",
|
||||
|
0
t/t3411-rebase-preserve-around-merges.sh
Normal file → Executable file
0
t/t3411-rebase-preserve-around-merges.sh
Normal file → Executable file
@ -38,6 +38,31 @@ test_expect_success \
|
||||
'git diff-tree -r -M --name-status HEAD^ HEAD | \
|
||||
grep "^R100..*path1/COPYING..*path0/COPYING"'
|
||||
|
||||
test_expect_success \
|
||||
'checking -k on non-existing file' \
|
||||
'git mv -k idontexist path0'
|
||||
|
||||
test_expect_success \
|
||||
'checking -k on untracked file' \
|
||||
'touch untracked1 &&
|
||||
git mv -k untracked1 path0 &&
|
||||
test -f untracked1 &&
|
||||
test ! -f path0/untracked1'
|
||||
|
||||
test_expect_success \
|
||||
'checking -k on multiple untracked files' \
|
||||
'touch untracked2 &&
|
||||
git mv -k untracked1 untracked2 path0 &&
|
||||
test -f untracked1 &&
|
||||
test -f untracked2 &&
|
||||
test ! -f path0/untracked1
|
||||
test ! -f path0/untracked2'
|
||||
|
||||
# clean up the mess in case bad things happen
|
||||
rm -f idontexist untracked1 untracked2 \
|
||||
path0/idontexist path0/untracked1 path0/untracked2 \
|
||||
.git/index.lock
|
||||
|
||||
test_expect_success \
|
||||
'adding another file' \
|
||||
'cp "$TEST_DIRECTORY"/../README path0/README &&
|
||||
|
Loading…
Reference in New Issue
Block a user