From b120ef3eac677762427631d5ae7372402a80b837 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Wed, 8 May 2013 20:16:56 -0500 Subject: transport-helper: trivial style cleanup Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index dcd8d97411..fdd79d8b35 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -211,9 +211,8 @@ static struct child_process *get_helper(struct transport *transport) int i; data->refspec_nr = refspec_nr; data->refspecs = parse_fetch_refspec(refspec_nr, refspecs); - for (i = 0; i < refspec_nr; i++) { + for (i = 0; i < refspec_nr; i++) free((char *)refspecs[i]); - } free(refspecs); } strbuf_release(&buf); -- cgit v1.2.1 From e2161bc38514722050b3a9c50a7897c40b6a93cf Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Thu, 9 May 2013 02:13:28 -0700 Subject: mergetools/kdiff3: do not use --auto when diffing The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto- solvable." This flag was carried over from the original mergetool commands. diff_cmd() is for two-way comparisons only so remove the superfluous flag. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- mergetools/kdiff3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 28fead428b..a30034f116 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -1,5 +1,5 @@ diff_cmd () { - "$merge_tool_path" --auto \ + "$merge_tool_path" \ --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ "$LOCAL" "$REMOTE" >/dev/null 2>&1 } -- cgit v1.2.1 From abdb9b2e4fd7876ab7138119c4aedca70bc0d250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 9 May 2013 15:10:48 +0200 Subject: t5004: ignore pax global header file Versions of tar that don't know pax headers -- like the ones in NetBSD 6 and OpenBSD 5.2 -- extract them as regular files. Explicitly ignore the file created for our global header when checking the list of extracted files, as this is normal and harmless fall-back behaviour. This fixes test 3 of t5004 on these platforms. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- t/t5004-archive-corner-cases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index bfdb56a069..ddf6e35069 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -23,7 +23,7 @@ check_dir() { echo "$dir/$i" done } | sort >expect && - find "$dir" -print | sort >actual && + find "$dir" ! -name pax_global_header -print | sort >actual && test_cmp expect actual } -- cgit v1.2.1 From ea2d20d4c2216faa8ff4525e9e73b26509405766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 9 May 2013 15:13:47 +0200 Subject: t5004: avoid using tar for checking emptiness of archive Test 2 of t5004 checks if a supposedly empty tar archive really contains no files. 24676f02 (t5004: fix issue with empty archive test and bsdtar) removed our commit hash to make it work with bsdtar, but the test still fails on NetBSD and OpenBSD, which use their own tar that considers a tar file containing only NULs as broken. Here's what the different archivers do when asked to create a tar file without entries: $ uname -v NetBSD 6.0.1 (GENERIC) $ gtar --version | head -1 tar (GNU tar) 1.26 $ bsdtar --version bsdtar 2.8.4 - libarchive 2.8.4 $ : >zero.tar $ perl -e 'print "\0" x 10240' >tenk.tar $ sha1 zero.tar tenk.tar SHA1 (zero.tar) = da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA1 (tenk.tar) = 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c $ : | tar cf - -T - | sha1 da39a3ee5e6b4b0d3255bfef95601890afd80709 $ : | gtar cf - -T - | sha1 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c $ : | bsdtar cf - -T - | sha1 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c So NetBSD's native tar creates an empty file, while GNU tar and bsdtar both give us 10KB of NULs -- just like git archive with an empty tree. Now let's see how the archivers handle these two kinds of empty tar files: $ tar tf zero.tar; echo $? tar: Unexpected EOF on archive file 1 $ gtar tf zero.tar; echo $? gtar: This does not look like a tar archive gtar: Exiting with failure status due to previous errors 2 $ bsdtar tf zero.tar; echo $? 0 $ tar tf tenk.tar; echo $? tar: Cannot identify format. Searching... tar: End of archive volume 1 reached tar: Sorry, unable to determine archive format. 1 $ gtar tf tenk.tar; echo $? 0 $ bsdtar tf tenk.tar; echo $? 0 NetBSD's tar complains about both, bsdtar happily accepts any of them and GNU tar doesn't like zero-length archive files. So the safest course of action is to stay with our block-of-NULs format which is compatible with GNU tar and bsdtar, as we can't make NetBSD's native tar happy anyway. We can simplify our test, however, by taking tar out of the picture. Instead of extracting the archive and checking for the non-presence of files, check if the file has a size of 10KB and contains only NULs. This makes t5004 pass on NetBSD and OpenBSD. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- t/t5004-archive-corner-cases.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index ddf6e35069..8d1bbd356a 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -29,9 +29,8 @@ check_dir() { test_expect_success 'tar archive of empty tree is empty' ' git archive --format=tar HEAD: >empty.tar && - make_dir extract && - "$TAR" xf empty.tar -C extract && - check_dir extract + perl -e "print \"\\0\" x 10240" >10knuls.tar && + test_cmp 10knuls.tar empty.tar ' test_expect_success 'tar archive of empty tree with prefix' ' -- cgit v1.2.1 From 92758dd2a2de94c90c0697ef0e8174c3543a47f9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 9 May 2013 12:37:53 -0700 Subject: Git 1.8.2.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.2.3.txt | 19 +++++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.8.2.3.txt diff --git a/Documentation/RelNotes/1.8.2.3.txt b/Documentation/RelNotes/1.8.2.3.txt new file mode 100644 index 0000000000..613948251a --- /dev/null +++ b/Documentation/RelNotes/1.8.2.3.txt @@ -0,0 +1,19 @@ +Git v1.8.2.3 Release Notes +========================== + +Fixes since v1.8.2.2 +-------------------- + + * "rev-list --stdin" and friends kept bogus pointers into the input + buffer around as human readable object names. This was not a + huge problem but was exposed by a new change that uses these + names in error output. + + * When "git difftool" drove "kdiff3", it mistakenly passed --auto + option that was meant while resolving merge conflicts. + + * "git remote add" command did not diagnose extra command line + arguments as an error and silently ignored them. + +Also contains a handful of trivial code clean-ups, documentation +updates, updates to the test suite, etc. diff --git a/Documentation/git.txt b/Documentation/git.txt index 8438c076c3..9e302b0a60 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.8.2.2/git.html[documentation for release 1.8.2.2] +* link:v1.8.2.3/git.html[documentation for release 1.8.2.3] * release notes for + link:RelNotes/1.8.2.3.txt[1.8.2.3]. link:RelNotes/1.8.2.2.txt[1.8.2.2]. link:RelNotes/1.8.2.1.txt[1.8.2.1]. link:RelNotes/1.8.2.txt[1.8.2]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 7186e774a8..f7ec14ad92 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.2.2 +DEF_VER=v1.8.2.3 LF=' ' diff --git a/RelNotes b/RelNotes index 1566ea44df..155555ef6a 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.8.2.2.txt \ No newline at end of file +Documentation/RelNotes/1.8.2.3.txt \ No newline at end of file -- cgit v1.2.1