diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 16:14:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 16:14:13 -0700 |
| commit | 9d73fad4ca15bc0fffe34ee66aea5b9691ab3d2f (patch) | |
| tree | 77e6233101f5f43819b9231cb474a56440d15747 | |
| parent | [PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse (diff) | |
| download | tgif-9d73fad4ca15bc0fffe34ee66aea5b9691ab3d2f.tar.xz | |
git-rev-parse: flush "default" head when encountering something unexpected
The unexpected thing is likely a pathname, we need the default for that
too.
| -rw-r--r-- | rev-parse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rev-parse.c b/rev-parse.c index 1f4f3240de..7419d18b3b 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -111,9 +111,12 @@ int main(int argc, char **argv) printf("^%s\n", sha1_to_hex(sha1)); continue; } + if (def) { + printf("%s\n", def); + def = NULL; + } if (revs_only) continue; - def = NULL; printf("%s\n", arg); } if (def) |