diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:10 -0700 |
| commit | 507fe835ed0753ff266fdb998853cc5dea3758c6 (patch) | |
| tree | 06a7d355d50bea90bf2a3859c11e9d9a5b633b6f /builtin/show-branch.c | |
| parent | b8e533f12acec63242c5405286fbbcfa66eecfdd (diff) | |
| parent | 1956dfa818e376c5d62adc16d77f5b5cacf923f8 (diff) | |
| download | git-507fe835ed0753ff266fdb998853cc5dea3758c6.tar.gz git-507fe835ed0753ff266fdb998853cc5dea3758c6.tar.xz | |
Merge branch 'da/rev-parse-verify-quiet'
"rev-parse --verify --quiet $name" is meant to quietly exit with a
non-zero status when $name is not a valid object name, but still
gave error messages in some cases.
* da/rev-parse-verify-quiet:
stash: prefer --quiet over shell redirection of the standard error stream
refs: make rev-parse --quiet actually quiet
t1503: use test_must_be_empty
Documentation: a note about stdout for git rev-parse --verify --quiet
Diffstat (limited to 'builtin/show-branch.c')
| -rw-r--r-- | builtin/show-branch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index a1275237e..199b081e9 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -723,6 +723,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) char nth_desc[256]; char *ref; int base = 0; + unsigned int flags = 0; if (ac == 0) { static const char *fake_av[2]; @@ -749,7 +750,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) /* Ah, that is a date spec... */ unsigned long at; at = approxidate(reflog_base); - read_ref_at(ref, at, -1, sha1, NULL, + read_ref_at(ref, flags, at, -1, sha1, NULL, NULL, NULL, &base); } } @@ -760,7 +761,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) unsigned long timestamp; int tz; - if (read_ref_at(ref, 0, base+i, sha1, &logmsg, + if (read_ref_at(ref, flags, 0, base+i, sha1, &logmsg, ×tamp, &tz, NULL)) { reflog = i; break; |