Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Sync with v1.8.2.3

* maint:
  Git 1.8.2.3
  t5004: avoid using tar for checking emptiness of archive
  t5004: ignore pax global header file
  mergetools/kdiff3: do not use --auto when diffing
  transport-helper: trivial style cleanup
  • Loading branch information...
commit b387c77b12953d543bf5efc3825b5be26d753f9c 2 parents faf8fde + 92758dd
@gitster gitster authored
View
19 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.
View
3  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].
View
2  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
}
View
7 t/t5004-archive-corner-cases.sh
@@ -23,15 +23,14 @@ 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
}
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' '
View
3  transport-helper.c
@@ -214,9 +214,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);
Please sign in to comment.
Something went wrong with that request. Please try again.