summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-08 22:13:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-08 22:13:52 (GMT)
commitfa5f2398e5163f855b0a680b0bf704e2c2e7da24 (patch)
treea87e63fbd7424b4814c21c26c8f9d976ea00a89c
parente5da8655b23737a8449868e1d99973a8d0e25fe3 (diff)
parentbdfc6b364a51b19efbacbd46fcef5be41a5db50e (diff)
downloadgit-fa5f2398e5163f855b0a680b0bf704e2c2e7da24.zip
git-fa5f2398e5163f855b0a680b0bf704e2c2e7da24.tar.gz
git-fa5f2398e5163f855b0a680b0bf704e2c2e7da24.tar.bz2
Sync with 2.6.4
-rw-r--r--Documentation/RelNotes/2.6.4.txt15
-rw-r--r--Documentation/git.txt3
-rw-r--r--wt-status.c9
3 files changed, 21 insertions, 6 deletions
diff --git a/Documentation/RelNotes/2.6.4.txt b/Documentation/RelNotes/2.6.4.txt
index 621eb95..b0256a2 100644
--- a/Documentation/RelNotes/2.6.4.txt
+++ b/Documentation/RelNotes/2.6.4.txt
@@ -44,5 +44,20 @@ Fixes since v2.6.3
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.
+ * There was no way to defeat a configured rebase.autostash variable
+ from the command line, as "git rebase --no-autostash" was missing.
+
+ * Allow "git interpret-trailers" to run outside of a Git repository.
+
+ * Produce correct "dirty" marker for shell prompts, even when we
+ are on an orphan or an unborn branch.
+
+ * Some corner cases have been fixed in string-matching done in "git
+ status".
+
+ * Apple's common crypto implementation of SHA1_Update() does not take
+ more than 4GB at a time, and we now have a compile-time workaround
+ for it.
+
Also contains typofixes, documentation updates and trivial code
clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 900272b..cbf157b 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v2.6.3/git.html[documentation for release 2.6.3]
+* link:v2.6.4/git.html[documentation for release 2.6.4]
* release notes for
+ link:RelNotes/2.6.4.txt[2.6.4],
link:RelNotes/2.6.3.txt[2.6.3],
link:RelNotes/2.6.2.txt[2.6.2],
link:RelNotes/2.6.1.txt[2.6.1],
diff --git a/wt-status.c b/wt-status.c
index 435fc28..ced53dd 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1317,15 +1317,14 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
target += strlen(" to ");
strbuf_reset(&cb->buf);
hashcpy(cb->nsha1, nsha1);
- for (end = target; *end && *end != '\n'; end++)
- ;
- if (!memcmp(target, "HEAD", end - target)) {
+ end = strchrnul(target, '\n');
+ strbuf_add(&cb->buf, target, end - target);
+ if (!strcmp(cb->buf.buf, "HEAD")) {
/* HEAD is relative. Resolve it to the right reflog entry. */
+ strbuf_reset(&cb->buf);
strbuf_addstr(&cb->buf,
find_unique_abbrev(nsha1, DEFAULT_ABBREV));
- return 1;
}
- strbuf_add(&cb->buf, target, end - target);
return 1;
}