Show all
Author Commit Message Date
Junio C Hamano
Git Signed-off-by: Junio C Hamano <>
Jon Seymour
stash: fix git stash branch regression when branch creation fails "git stash branch <branch> <stash>" started discarding the stash when the branch creation fails. It should have kept the stash intact when aborting. Signed-off-by: Jon Seymour <> Signed-off-by: Junio C Hamano <>
Tomas Carnecky
stash drops the stash even if creating the branch fails because it already exists This bug was disovered by someone on IRC when he tried to $ git stash branch <branch> <stash> while <branch> already existed. In that case the stash is dropped even though it isn't applied on any branch, so the stash is effectively lost. Signed-off-by: Tomas Carnecky <> Signed-off-by: Junio C Hamano <>
Linus Torvalds
Fix missing 'does' in man-page for 'git checkout' Reported-by: Rainer Standke <> Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Pat Notz
dir.c: squelch false uninitialized memory warning GCC 4.4.4 on MacOS incorrectly warns about potential use of uninitialized memory. Signed-off-by: Pat Notz <> Signed-off-by: Junio C Hamano <>
Brandon Casey
git-send-email.perl: ensure $domain is defined before using it valid_fqdn() may attempt to operate on an undefined value if Net::Domain::domainname fails to determine the domain name. This causes perl to emit unpleasant warnings. So, add a check for whether $domain has been defined before using it. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
Brandon Casey
wt-status.c: don't leak directory entries when processing untracked,ignored When iterating through the list of directory entries, searching for untracked entries, only the entries added to the string_list were free'd. The rest (tracked or not matching the pathspec) were leaked. Ditto for the "ignored" loop. Rearrange the loops so that all entries are free'd. Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
Christian Couder
t6050 (replace): fix bogus "fetch branch with replacement" test The test was missing some "&&" at the end of some lines and it was wrong because, as the replacement refs were not fetched, the commits from the parallel branch should not show up. This was found by Elijah Newren. This is fixed by checking that after the branch from HASH6 is fetched, the commits from the parallel branch don't show up, and then by fetching the replacement refs and checking that th…
Wesley J. Landaker
Documentation: Refer to git-commit-tree in git-filter-branch help Currently, the help for git filter-branch refers users of --env-filter to git-commit for information about environment variables affecting commits. However, this information is not contained in the git-commit help, but is very explicitly detailed in git-commit-tree. Signed-off-by: Wesley J. Landaker <> Signed-off-by: Junio C Hamano <>
Matthieu Moy
update comment and documentation for :/foo syntax The documentation in revisions.txt did not match the implementation, and the comment in sha1_name.c was incomplete. Signed-off-by: Matthieu Moy <> Signed-off-by: Junio C Hamano <>
Daniel Knittl-Frank
Improvements to `git checkout -h` be a little more verbose about what each option does Signed-off-by: Daniel Knittl-Frank <> Reviewed-by: Matthieu Moy <> Signed-off-by: Junio C Hamano <>
Michael J Gruber
contrib/completion: --no-index option to git diff Signed-off-by: Michael J Gruber <> Signed-off-by: Junio C Hamano <>
Jeff King
prefer test -h over test -L in shell scripts Even though "-L" is POSIX, the former is more portable, and we tend to prefer it already. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
CodingGuidelines: spell Arithmetic Expansion with $(($var)) POSIX wants shells to support both "N" and "$N" and requires them to yield the same answer to $((N)) and $(($N)), but we should aim for portability in a case like this, especially when the price we pay to do so is so small, i.e. a few extra dollars. Signed-off-by: Junio C Hamano <>
Ramsay Jones
t1503: Fix arithmetic expansion syntax error when using dash On systems which have dash as /bin/sh, such as Ubuntu, the final test (master@{n} for various n) fails with a syntax error while processing an arithmetic expansion. The syntax error is caused by using a bare name ('N') as a variable reference in the expression. In order to avoid the syntax error, we spell the variable reference as '$N' rather than simply 'N'. Signed-off-by: Ramsay Jones <ramsay@…
Pat Notz
strbuf.h: fix comment typo Signed-off-by: Pat Notz <> Signed-off-by: Junio C Hamano <>
Brian Gernhardt
git-stash: fix flag parsing Currently git-stash uses `git rev-parse --no-revs -- "$@"` to set its FLAGS variable. This is the same as `FLAGS="-- $@"`. It should use `git rev-parse --no-revs --flags "$@"`, but that eats any "-q" or "--quiet" argument. So move the check for quiet before rev-parse. Signed-off-by: Brian Gernhardt <> Signed-off-by: Junio C Hamano <>
Brandon Casey
t/t3903-stash: improve testing of git-stash show Recently, the 'stash show' functionality was broken for the case when a stash-like argument was supplied. Since, commit 9bf09e, 'stash show' when supplied a stash-like argument prints nothing and still exists with a zero status. Unfortunately, the flaw slipped through the test suite cracks since the output of 'stash show' was not verified to be correct. Improve and expand on the existing tests …
Junio C Hamano
Git 1.7.3 Signed-off-by: Junio C Hamano <>
Junio C Hamano
Merge branch 'js/ls-files-x-doc' * js/ls-files-x-doc: ls-files documentation: reword for consistency git-ls-files.txt: clarify -x/--exclude option Conflicts: Documentation/git-ls-files.txt
Chris Johnsen replace cut with ${v%% *} Some versions of cut do not cope well with lines that do not end in an LF. In this case, we can completely avoid cut by using the ${var%% *} parameter expansion (suggested by Brandon Casey). I found this problem when t3404's "avoid unnecessary reset" failed due to the "rebase -i" not avoiding updating the tested timestamp. On a Mac OS X 10.4.11 system: % printf '%s' 'foo bar' | /usr/bin/cut…
Brandon Casey
t/t7300: workaround ancient touch by rearranging arguments The ancient touch on Solaris 7 thinks that a decimal number supplied as the first argument specifies a date_time to give to the files specified by the remaining arguments. In this case, it fails to parse '1' as a proper date_time and exits with a failure status. Workaround this flaw by rearranging the arguments supplied to touch so that a non-digit appears first and touch will not be confused. …
Junio C Hamano
Merge branch 'bg/fix-t7003' * bg/fix-t7003: t7003: Use test_commit instead of custom function
Junio C Hamano
ls-files documentation: reword for consistency Similar to descriptions of other options, state what -x does in imperative mood. Start sentences for -X and --exclude-per-directory options in capital letters. Signed-off-by: Junio C Hamano <>
Jay Soffian
git-ls-files.txt: clarify -x/--exclude option Since b5227d8, -x/--exclude does not apply to cached files. This is easy to miss unless you read the discussion in the EXCLUDE PATTERNS section. Clarify that the option applies to untracked files and direct the reader to EXCLUDE PATTERNS. Signed-off-by: Jay Soffian <> Signed-off-by: Junio C Hamano <>
Junio C Hamano
Git 1.7.3 rc2
Junio C Hamano
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix' * dr/maint-ls-tree-prefix-recursion-fix: ls-tree $di $dir: do not mistakenly recurse into directories
Junio C Hamano
Merge branch 'os/fix-rebase-diff-no-prefix' * os/fix-rebase-diff-no-prefix: Add --src/dst-prefix to git-formt-patch in
Junio C Hamano
Merge branch 'jl/fix-test' * jl/fix-test: t1020: Get rid of 'cd "$HERE"' at the start of each test t2016 (checkout -p): add missing && t1302 (core.repositoryversion): style tweaks t2105 (gitfile): add missing && t1450 (fsck): remove dangling objects tests: subshell indentation stylefix Several tests: cd inside subshell instead of around
Junio C Hamano
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor' * ch/filter-branch-deprecate-remap-to-ancestor: filter-branch: retire --remap-to-ancestor
  1. Prev
  2. Next