mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind
This commit is contained in:
commit
f081731090
|
@ -21,7 +21,7 @@ allocated memory or not), use `strbuf_detach()` to unwrap a memory
|
|||
buffer from its strbuf shell in a safe way. That is the sole supported
|
||||
way. This will give you a malloced buffer that you can later `free()`.
|
||||
+
|
||||
However, it it totally safe to modify anything in the string pointed by
|
||||
However, it is totally safe to modify anything in the string pointed by
|
||||
the `buf` member, between the indices `0` and `len-1` (inclusive).
|
||||
|
||||
. The `buf` member is a byte array that has at least `len + 1` bytes
|
||||
|
|
|
@ -1507,7 +1507,7 @@ so on a different branch and then coming back), unstash the
|
|||
work-in-progress changes.
|
||||
|
||||
------------------------------------------------
|
||||
$ git stash "work in progress for foo feature"
|
||||
$ git stash save "work in progress for foo feature"
|
||||
------------------------------------------------
|
||||
|
||||
This command will save your changes away to the `stash`, and
|
||||
|
|
2
Makefile
2
Makefile
|
@ -1353,7 +1353,7 @@ endif
|
|||
|
||||
### Testing rules
|
||||
|
||||
TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X
|
||||
TEST_PROGRAMS = test-chmtime$X test-dump-cache-tree$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X
|
||||
|
||||
all:: $(TEST_PROGRAMS)
|
||||
|
||||
|
|
|
@ -2435,7 +2435,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
|
|||
return error("%s: %s", old_name, strerror(errno));
|
||||
}
|
||||
|
||||
if (!cached)
|
||||
if (!cached && !tpatch)
|
||||
st_mode = ce_mode_from_stat(*ce, st->st_mode);
|
||||
|
||||
if (patch->is_new < 0)
|
||||
|
|
Loading…
Reference in a new issue