Merge branch 'maint'
* maint: Documentation: fix invalid reference to 'mybranch' in user manual Fix deleting reflog entries from HEAD reflog reflog test: add more tests for 'reflog delete' Documentation: rev-list-options: Fix -g paragraph formatting Conflicts: Documentation/user-manual.txtmaint
commit
10d9d887ec
|
@ -264,10 +264,10 @@ With '\--pretty' format other than oneline (for obvious reasons),
|
||||||
this causes the output to have two extra lines of information
|
this causes the output to have two extra lines of information
|
||||||
taken from the reflog. By default, 'commit@\{Nth}' notation is
|
taken from the reflog. By default, 'commit@\{Nth}' notation is
|
||||||
used in the output. When the starting commit is specified as
|
used in the output. When the starting commit is specified as
|
||||||
'commit@{now}', output also uses 'commit@\{timestamp}' notation
|
'commit@\{now}', output also uses 'commit@\{timestamp}' notation
|
||||||
instead. Under '\--pretty=oneline', the commit message is
|
instead. Under '\--pretty=oneline', the commit message is
|
||||||
prefixed with this information on the same line.
|
prefixed with this information on the same line.
|
||||||
|
+
|
||||||
Cannot be combined with '\--reverse'.
|
Cannot be combined with '\--reverse'.
|
||||||
See also linkgit:git-reflog[1].
|
See also linkgit:git-reflog[1].
|
||||||
|
|
||||||
|
|
|
@ -2825,8 +2825,8 @@ You can also add a "+" to force the update each time:
|
||||||
$ git config remote.example.fetch +master:ref/remotes/example/master
|
$ git config remote.example.fetch +master:ref/remotes/example/master
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
|
||||||
Don't do this unless you're sure you won't mind "git-fetch" possibly
|
Don't do this unless you're sure you won't mind "git fetch" possibly
|
||||||
throwing away commits on mybranch.
|
throwing away commits on 'example/master'.
|
||||||
|
|
||||||
Also note that all of the above configuration can be performed by
|
Also note that all of the above configuration can be performed by
|
||||||
directly editing the file .git/config instead of using
|
directly editing the file .git/config instead of using
|
||||||
|
|
|
@ -604,8 +604,8 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dwim_ref(argv[i], spec - argv[i], sha1, &ref)) {
|
if (!dwim_log(argv[i], spec - argv[i], sha1, &ref)) {
|
||||||
status |= error("%s points nowhere!", argv[i]);
|
status |= error("no reflog for '%s'", argv[i]);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -188,16 +188,30 @@ test_expect_success 'delete' '
|
||||||
test_tick &&
|
test_tick &&
|
||||||
git commit -m tiger C &&
|
git commit -m tiger C &&
|
||||||
|
|
||||||
test 5 = $(git reflog | wc -l) &&
|
HEAD_entry_count=$(git reflog | wc -l)
|
||||||
|
master_entry_count=$(git reflog show master | wc -l)
|
||||||
|
|
||||||
|
test $HEAD_entry_count = 5 &&
|
||||||
|
test $master_entry_count = 5 &&
|
||||||
|
|
||||||
|
|
||||||
git reflog delete master@{1} &&
|
git reflog delete master@{1} &&
|
||||||
git reflog show master > output &&
|
git reflog show master > output &&
|
||||||
test 4 = $(wc -l < output) &&
|
test $(($master_entry_count - 1)) = $(wc -l < output) &&
|
||||||
|
test $HEAD_entry_count = $(git reflog | wc -l) &&
|
||||||
! grep ox < output &&
|
! grep ox < output &&
|
||||||
|
|
||||||
|
master_entry_count=$(wc -l < output)
|
||||||
|
|
||||||
|
git reflog delete HEAD@{1} &&
|
||||||
|
test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
|
||||||
|
test $master_entry_count = $(git reflog show master | wc -l) &&
|
||||||
|
|
||||||
|
HEAD_entry_count=$(git reflog | wc -l)
|
||||||
|
|
||||||
git reflog delete master@{07.04.2005.15:15:00.-0700} &&
|
git reflog delete master@{07.04.2005.15:15:00.-0700} &&
|
||||||
git reflog show master > output &&
|
git reflog show master > output &&
|
||||||
test 3 = $(wc -l < output) &&
|
test $(($master_entry_count - 1)) = $(wc -l < output) &&
|
||||||
! grep dragon < output
|
! grep dragon < output
|
||||||
|
|
||||||
'
|
'
|
||||||
|
|
Loading…
Reference in New Issue